Fixed #637