Implemented issue #22.