Created a patch for this issue