Fix multi-expand as per PR #4941