Resolve partition rewrite repitition