Bug fix #224