Fixed issue on startup
Revert "Fixed issue on startup"

This reverts commit 9d84bcbe6369b5c3fb162368fafefe279f5df1e1.