removed condition check