INFRA-39 Hopefully making check work