bug fix against rolling std