Bug fix from last push