fix: rewrite issue