Fix delete listener bug