fixed class loading