fixed warp bug