fixed bad null value propagation