Additional checks for #8