Fixed the stuck-on-startup bug