Fixed #838