Adding auto wrapping via pluggin which works much better