Fixing up listener