Better workaround for IBM JDK and local workers.

Close #22