Database Big Bug fixed