Thought we'd caught this, think it's in another/later branch.