Yep, it will be much better. I will prepare fix for that.