Fix and test a regression in 56c1c0d089610bf62b40f9d9807569e162ba3888; closes #22