Fixed #1933