Merge pull request #2391 from Motionden/fix/character-width-calculations

Fix character width calculations