Improve compatibility with standart ruleset