Implementing issue #23