Removed unneeded setting check