hotfixes to fix animation