#sf-66 fixed