fixed clashing settings