Project 8 bug fix