Fix DatabaseAccessObject