Bug fix #641