SMS Fix 2.0