Animation still buggy