We should have UT's for this method too