Made java1.6 compatible