Fixing the Flaws