product rewrites fix