Fixed error with the classes