Added extra condition