Arg. Generics and 1.6 vs 1.7. :P