Add conditional statement for consistency