Fixed #839