fixed duplicate set calling