Classification crash fix