fixed a db bug
Merge branch 'tlei-devel'