fixed wrapping in a non-hacky way