Animation rendering and handling fix