Added notypeof true which was removed during merge