Bug fix #400