Bug fix: don't add listeners unlimited