in CivicCRM 4 +J 1.6 there is a clash with the $componentid variable

With the Joomla debugger turned on front end links to civicrm are giving this trace

Notice: Undefined property: stdClass::$componentid in /home/elin/www/163civi/libraries/joomla/application/menu.php on line 231
Call Stack: 0.0004 353892 1.

() /home/elin/www/163civi/index.php:0 4.0142 5871636
2. JSite->dispatch() /home/elin/www/163civi/index.php:43 4.2146 6206660
3. JComponentHelper::renderComponent() /home/elin/www/163civi/includes/application.php:188 4.3958 6289168
4. require_once('/home/elin/www/163civi/components/com_civicrm/civicrm.php') /home/elin/www/163civi/libraries/joomla/application/component/helper.php:152 5.0687 10946208
5. civicrm_invoke() /home/elin/www/163civi/components/com_civicrm/civicrm.php:29 5.4704 12592292
6. JMenuSite->getItems() /home/elin/www/163civi/components/com_civicrm/civicrm.php:60 5.4704 12592896
7. JMenu->getItems() /home/elin/www/163civi/includes/menu.php:100

In looking at what is happening inside the menu it appears that component is falling back on com_content because the $componentid is not found. I suspect this is because the $componentid that Joomla is expecting is com_civicrm but what it is actually getting is the $componentID from Civicrm.