Fixed #729