Fix generic issue, worked in Eclipse, but not with javac/maven.