resolves issue #18