Retain java 6 compatibility