Update to issue #31