Resolved JBIDE-14165

Second attempt. Hopefully all will be ok this time.