Fixed erasure problem for JDK 7 compiling