Fix Keyframe implementation