-Minor Fix
Merge branch 'AndrewS/FixLenghtConvertor' into FixForMErge