Try to handle a different whichwrap setting