Fixed convert (ext/intl finished)