Dbfunction refix