Fixed #698