Pushed fix to make sure all rewrites are attempted