samuel fixes