JBIDE-16534 JBIDE-16535 - incorrect subsystem resolution