Db0008 fix