Bug fix #611