Fixed white space problem