removed null from id generation