Fix goal table