closes #349 - fixes bug with components and data propagation