Merge a possible fix from the FrameScheduler into this to possibly fix #55