Not sure why this commit is needed