Bug fix #652