Resolves gh-33