Fix whenever_command