ndphillips bug fix