Another prediction bug fix attempt