Please add a test for this