Bug fix for the listeners module