Fix bug #1706