Fix for SF bug #253.
Log for fix for SF bug #253.