Add to issue #6