* merge a fix from the pdiff branch