bug fix from ref
merge from ref
consistency