Fix according to issue 12619
add files