BS-10783
Fix typo
Refactoring add converter to ease unit testing