Fix Goal to GoalTO conversion method