pre-class fix