* Optimize for java 1.7.x