Re #1257 Fixing conversion issues.