Fixed change between Component and Container