fix for SF bug #244