Additional check, references #549