Fix #1713