Fix #1793