Fixed #614