Improving double check argument