Fixed iteration issue with animation