Fix old state fails