JBIDE-18405: Fix