fix bug
Merge pull request #3044 from ZappoMan/master

fix bug