RAWR, fixed better now. No More Smash