Bug fix #819