Temporal fix to avoid header contents stay not expanded while expanding header