Lapse fix