Fixes upstream issue #2