Make the fix for issue #19 work with word wrap as well