gets closer to the spirit of #68, but does not close it