JLANG-35 changed the methods used