Attempt to deal with stupid database issues