Fixed issues with keyframes