In 1.2.170 Beta we have a fix for that (if I understand your request right):
Could you please take a look?