Fixed issue with auto id