Fix for Component