[v.1.7.1] Added fix for the some compatibility problems