Fix listener problem