Bug fix #216