JBIDE-13782 fix as per requests