Modified this file so that it can be applied without any problem.