fixed if issue