Fix first time experience bug