See: #1716
See: #1716