fix for component lifecycle issues