more hacks to prevent accidentally wrapping