fixed #958