null each fix