Hot fix start-crash