Bug fix #436