Bug fix #442