fix whenever error