To address #180 and #525.
To address #180 and #525.