fixed minor bug introduced during the merge from trunk