Not sure if this actually works any better but it seems a little more right.