refresh buf fix hack. locally bug disappears. updated fixture a bit.
Merge remote-tracking branch 'origin/master'