Fixed listener problem