Compilation with source=1.6 fixed