Extra checks for #625