JBIDE-18183 - updates as per feedback from others
JBIDE-18183 - fix the stupid static method