Solving an issue in r69542