Fix: Java6 compatibility