Fix for dynamically added components