fix issue for DB