Resolves gh-77.