Fixed #514
in case of component implementation the annex subclaus was added to
twice instead of also adding the subcaluse from the type.