Resolves issue #257