fixed if statement, removed &&