Bug fix #408