fix for dbs3

Not merge yet until its validated.