Another animation fix attempt