Fix current status of conversion