Change structure of check to appease claudio