PoC fix: prevent warping over obstacles