Issue #76 - Improved rewrite check