Changed to java 1.6 compatibility