fix issue #2 from upstream