Fix start-class