Hotfix to move firstRun check to new location