Fixed wrong conversion issues.