Final classifier bug fix