Fix #2517