Fix for classes