Implementing issue #21