Fix extended types