Resolves issues from #86