Fix cannot remove executor listener bug