[IMP] Issue-2182: Improve narrow style #2182

Fix issue #2182: