copy one more fix from master