made java 1.6 compatible