Fix for IDs not being generated