Fix bug #510270