Fix java6 compilation again