Make sure correct sending address is chosen.

Closes #14