FIx state history evaluation