Bug fix #399