Fixes #87

#87 
Please don't merge this, there may be other places where we changed the database