Fixes #63; also (either now or earlier) fixes #66