Re-fix state history evaluation