Fixes #64 and #67