patch that mitigates issue #121