Fix for whenisay removal