Fixed crashes!