This is fixed in the current beta and will be fixed for Toad version 17.1
You can get the beta here if you want.