Issue #809 - Fixing issues with conversion