cherry-pick Issue #69 fix: bbe41fcd235d71e7849d3cf4967cc3486176488c