Does this have potential to fix #2441?