Fix for id = "None" causing issues