Oops, should have been in last commit