fixed #955