Non-Refundable Not Working

[Alex208]

I recently changed a listing from "Strict" to "Moderate or Non-Refundable". Only problem is I have an Early Bird Discount and for some reason the non-refundable option doesn't show in conjunction with early bird. I opened a case with @Airbnb 10 days ago which they acknowledged should still be available with early bird promotion.  Frustrating part is that they have come back three times saying the issue has been fixed, and each time I have to tell them it still does not work. Is anyone else using these same promotions/cancellation periods and seeing any issues? Any ideas on workarounds besides turning off my early bird promotion?