Fixed the issues with inline listeners.