Change in CommonProxy.java