Fix for SF bug #237.