more java 6 support