Removed eval and duplicated check