Fixed #789