Refs #848:fix code according to review.