Fixed warp creation