Fixed #2610