commit location and crash fixed