DB Bug fix