Offline DB Fix