Fix Algorithm Auto-Selection