Fixed issue with animations