added &nbsp; handeling