#8237 - Protect Black Bodies