Fixed #929