A little bug fixing on the listener-related stuff just added