I think I fixed components