Created a patch for fixing this issue: