Bug fix #450