#288 - refactored to use same classpath than 3.9