Hopefully get the db check more reliable for #21