Changed if(...)