Custom Components bug correction