Fix Converter class