Quick upgrade fix