issue #3781, Minor fix & update submodule.