Added patch for canvas_replacement