Fix for 219, do not remove white space