Fix listeners not being restarted on $render