Fix for updated components