re fix #3 - BasicDatabase