hotfix from classes