Resolve #525

See associated PR for discussion, etc.