Fixed settings problem