Fixed remaining listener bug