Initial run crash fixed.