Make it compliant with java 6