Detect wrong component

fixes #23
With the comments preserved somehow...