Fixed issue with blank IDs