Fix #1856