Fix for JavaSE v1.7