Fix problem that can occur when people muck about in the database
Merge branch 'master' of github.com:iguess/iguess