Added to issue #90