@wagenet this property is the reason why the PR is WIP. Would prefer to avoid such hacks. Can you suggest other solution?