Add conditional
Fix conditional