fix goal save