Fixed issue with multiple disabled classes added