Fix warp bug