Fixed bugs created by last bug fix