Added component and fixed error crash with Tuong's solution