Bugfix

Warp crash attempt #1