year fix / disabled companion support