Update CommonFun.java