Don't munge + chars, part 2