even more hotfixing