Fix set handling