Fix state history evaluation