Updating according to issue 10567