fixed more if(