Changed from java 1.7 to 1.6