Fixed #818