Pet fix
Merge pull request #861 from Windower/4.1-dev

Pet fix