Created a patch from MR #5