Fixed #732