Hotfix for large persisted state