Implementing issue #21.