Extend and fix the converter.