#92 change conditional to eliminate possible failure modes