removed null guard