[Core] less deffects will be found