I should perform that check everywhere