FIX situation update blocking issue