Apply fix from upstream pull #686