Hotfix to prefix store changes