Implemented issue #257