Fixed hangs on start