Solved issue with River cells, didn't like adv. format