Fixed the skyfly crash (but see the comments)