Fixed issue with settings