meihuak we don't have a solution for this yet. You can also commission fixes to core by the way, but as we've already entered QA and thus feature freeze, it won't be added to v1.5 anymore. Fixing this in core first would make a lot of sense as any extension might need to be updated when this fix is released.