This happens often enough that we should probably add something for this in v2. It won't happen too soon, but hopefully it will happen :)