Adding hotfix for db state check