Bug fix #430