Good point. Will add this with corresponding tests.