Hotfixes/recover state