- fixed unusual race condition found after merge
- fix: potential crash if setting specified wrongly