resolves issue #37