This needs to be fixed for cloud databases too.