Address animation stop issues