port fix from master