Fix bug #1090516