@vojtajina This is not needed now I've rewritten the ngif fix. I'll close this and send in a series of prs for all this today