[Refactoring] Fixed for Java 6 compilation failure