Fix tracking of current situation