Fixed #955