goal fix and tag fix