Fix white screen of death issue in current build