fixes by ori and disable the addon untill it stabilize