Fixed #2880

Fixed #2880