new feature for 2.7 & bug fix