Rewiter,fix #1