Fix Goal inherietance