Add if clause to eval