Fixed warp problem