fix whenever