Fixing the pre-code wrapping