Fix bug #1217096