Bugfix + animation fix