change this mess to work with my package
shame on all the java world