Old one was fucking wrong and didn't work. This does.