goals fixes