fixed references to DB object