Quick Fix for #332 (Hunging up on start up)