fix for SF bug #243.
fix for SF bug #243.