Fix #1862