DB workaround