Initial fix for fixed width issue.
This corresponds to !269 (merged) for 'Sim09' and !283 (merged) for 'Sim09-upgrade'