bug fix from trunk