fixed class handling