Prev. commit bug fix