Feature #1607: Fix goup_by hiding

(cherry picked from commit b974d48581f1f7df104a0ec629851182da6aefa5)