Database Bug Fix