Fixed first-time-run crash