Fix issue with ng-if