Fixed #724