FIX: Fixed history recording in simulator