Failback class fix