Is this really needed for this PR ?