Fixed #691