Fixing patch after changes in the source code