Good point. We can should be able to remove that check for the fixed listeners..