Updated to fix startup problem