FIXED bugs with calculating on a changed grid