Bug fix from last check-in