Revert "Fixed bugged in FakeDatabase"

This reverts commit 4982a4518129c9e7ebe2c399699f2ef712ab63a2.
Bug fix