To address issues such as #779.
To address issues such as #779.