Bug fix #464