Fixes #116; also, fixes #117