split components
bug fix