Fixed #678