Correctly add overloads.
Add unit test for this.