simplify PR#94

Squashing the two commits together gives something small. I was considering committing that, but I would like another pair of eyes to make sure there is no obvious mistake hiding...