Minor cosmetic bug fix from last changes