I have some unpushed changes that Bright and I worked on that addresses this.