Make the code runs with r23552