try fix for parser
Parserstuff
Fix and simplifiy condition