Fix GRIFFON-641 (JDK6 compatibility)