classes fixes