JBIDE-17843 - try 2