Fix tsar logic