I have no idea what I was thinking (fixes #10)