Fix critical settings bug