YH-310: Fixed non-breaking spaces