test & bug fix