JBIDE-15491 - missed some refs