Update to compatiable with jdk 1.7