Almost working single selection invariance for #20