Fixed listeners leak