Relates to issue #43