fixing patterns to be more sensible.