Fix issue with AMP and AMV not measuring cells the same way

Resulted in glitches on boundaries.