Bug: Repair refenced old class