Fixing converters.
Merge pull request #969 from ngodfraind/master

Fixing converters.