proper fix for whenever