better & simpler check after Tom's comments