Fix issue with drift over multiple regions