bug fix And Submodule update