Another attempt to fix java 1.6 compatibility issues