fixing issues in conversion process.