Correct if .. is not None