Fix bug #1663