Fixed unmerged listener