Fixed problem with listener preventing commands from being run