resolves issue #17