Revert to for loops to deal with null cells