Bug fix #579