Fixed #849