Fixed scheme update