Fixes command listener bug