Fix longstanding next-frame clone bug