tightened up set checks