Some fix to converter