one more check added to 316f6bcf1b