Alternative fix for checkerboard edge case, also fixed the Helix.