WX-78

A FIX FOR BRAVERY PERFORMANCE ISSUES