Fix bug #1683