Fix broken clue handling.