fixed nullReference