fixed null id issue, two-way conversion works