CHANGE: Converter bug fix.
CHANGE: Converter bug fix.