Fix issue rewrite