Implementing issue #48