Fixed to deal with Java7 compiler