Fix issue with warping and crashing