I addressed this in commit  aef2d98