Fix reading classes