Fix issue where characters overlap

Change-Id: Ie75467228d7dad05aa4fe7b158cdc64ba4906e5f
Fixes: 63611324
Test: Visual
3 files changed