Looks like a decent fix :]