Merge "Fixed nbsp"