Why is this necessary ? Also, I don't see tests for this, don't we need some ?