Fixed issues with nested components