Added a mior fix to the listeners (ugly)