Fixed settings [MJ-389]