Yet another try at fixing this commit