Fix for infinite replace loop with repacks/propers