fixed class initialization