Reverted to Java6 compatibility