fixed class case issues