Goal reached fixup