Fixed #643