fixed #1: added component handling