Fixes and closes #67