If this fix works let's not bother with promotions, it's very slow