fixed #961