I added some changes to handle this.