Fixing the Hammer