Fix #1874