Bug fix #434