Removed lookup of current element in calls to history