Fixes #1: a quick fix to databases, hopefully notify Maki, and close issue