Close #182: expanded body-inner