Resolves issue #239