fixed null id