fixed class-problem