Make this check more clearer