fixes #409 - component data propagation happens in the correct place