Fix bug #1897