resolves issue #45