Fix frame_callback to do the right thing.