Fixed #683