Fix #1879