Delete class fix