Fixed brokers that gained errors on rewrite