Fixes github issue #81