Database Bug fixed