As @tojofo mentioned above, need some test coverage for this.