needs a better fix
Merge pull request #1450 from raymix/master

needs a better fix