Merge pull request #165 from slide/master

Fix 34571