Sounds alright with me. This will be a nice bug fix someday, but 1.17 is and should be priority right now. Patch is gonna be a game changer!