Fix for empty rewrite value