fixed white space handling