Adjustment for Java6