race condition fixes
fix animate