fixed issues with animation