Merge pull request #1271 from dorkster/fixes

Add bounds check when syncing Animations