Fixed Database Issue