huge fix for decorating deface classes at the appropriate phase of initialization