Fixes #310 and #250
Workaround for Burning Rush Problems
Merge pull request #316 from kirk24788/master

Fixes #310 and #250