fixed whenever bug