see issue #31