JBIDE-15901 - fix regression caused by  JBIDE-15651