made java 6 compliant