Added new if condition check