also fix listener