added fix on settings