fixed if(