Fixed bug with spaces &nbsp;