Implementing issue #227.