The same problem in issue #2648
Merge pull request #2672 from cookfront/master

The same problem in issue #2648