Thanks for writing to us. Actually, we already have identified this scenario and being tracked as a valid enhancement request to the product. Unfortunately there is no alternate solution through which you can fix this issue. We will get this added to the product in the upcoming releases. You will also be notified through release notes whenever it is included in the product.
We are internally discussing on this tracker and getting more details on the expectations of this enhancement and post which we will try for tagging it to one of the upcoming releases. We will keep you posted once we have more updates.