fix whenever bug