Make changes that  h0tw1r3 had made in a previous pull request