Fixed an issue with component creation order