sammy fixes