Fixed crashes somehow