Attempted to fix listener bugs.