Fixed in next commit - waiting to see if there's anything else before I do it, though.