fixing classes