I added a TODO for this, I'll see to this later.