#sf-69 fixed