Micro-fix from Marc Mutz