fixed #641