Fix Converter code duplication