Fix for SF bug #248.