Here is the patch of this fix.
(patch created at Coworks)