Fix bug spotted by Anoop K