Burn/Crit fix for RBY
Merge pull request #308 from Fuzzysqurl/branch1

Burn/Crit fix for RBY