Classes fix