Bug fix #341