fix regression due to too fast rewrite