Some issue fixed