fixed components issue