Fixes #74 and #75