This seems to work a bit better...