How did this ever work? Fixing and*.