I'm having the same exact issue in the same scenario. Did you find how to handle it?