Fixing the Rip