Fixed Database Problem