Is this change here needed?