Fixed path loading errors after class switch