Equipment class fix