Fix Algorithm assignment