fixed #963