Merge "Fix when >2 keyframes supplied"