Fixed lower compliance to Java-6