resolves issue #15