Databases bug workaround