Implemented issue #160.