Fixed conflicting settings