Rorder patches when necessary