quick-fix with a different approach
Merge pull request #2865 from hden/inline

quick-fix