So should we fix this check? And if so in what way?