fixing startup issue
Merge branch 'hotfix/startupIssue'