Database fix
Merge branch 'Klopsch'