I think it should. I'll add it to the TODO, needs some testing.