Fixed up uncommon bug with composite components