Fixed listener block execution