It's enough for now. We're currently working on the fix because it needs some rework. If you don't mind I'll probably ask you to test the final version. Thanks.