fix setting order