Fix start up crush