Fixes #67 and #68