JAL-2164 changed to be Java 1.7 compliant